Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 865)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-45

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/term/x-win.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/keyboard.c
Simple merge